am c2b74b87: am 57a3d3e1: Merge "Remove uses of density in PRODUCT_AAP_CONFIG" into lmp-mr1-dev

* commit 'c2b74b87d4ea4bcdef228080a874bad4aca7c323':
  Remove uses of density in PRODUCT_AAP_CONFIG