[automerger skipped] Merge "Rename DensityMap to DensityMapping per API...

[automerger skipped] Merge "Rename DensityMap to DensityMapping per API review" into tm-dev am: 2ca7d182 am: 5eecef4c am: 1b7ea46a -s ours

am skip reason: Merged-In Id54d23c088e98c6e629b62ccb74c9b1cd751615e with SHA-1 01aefc54 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17523148



Change-Id: Id13ab0ed6055506da870ad7d2c3b13037c4b48f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>