Also, move those settings from whitechapel_pro common folder Bug: 210598444 Test: build okay Change-Id: Ie96dd9e6da5bdddd62d2ed9f920cb49daa1d74eb
Bug: 202250383 Change-Id: I7b096bdb87ea45760bbcf929cd5757e159952e75