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

* commit '57a3d3e1f48f1719fdead0b13495230d772955b4':
  Remove uses of density in PRODUCT_AAP_CONFIG