Merge "Remove uses of density in PRODUCT_AAP_CONFIG" into lmp-mr1-dev