[automerge] Changing the name densityMap->densityMapping due to framework changes 2p: 226a5e3b66

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

Bug: 228268712
Change-Id: Ibf6fa69f6e64e33d705226685529229d42515599

data/etc/displayconfig/default_television.xml

@@ -1,5 +1,5 @@
 <displayConfiguration>
-    <densityMap>
+    <densityMapping>
          <density>
             <height>480</height>
             <width>720</width>
@@ -20,5 +20,5 @@
             <width>3840</width>
             <density>640</density>
          </density>
-    </densityMap>
+    </densityMapping>
 </displayConfiguration>

services/core/java/com/android/server/display/DisplayDeviceConfig.java

@@ -74,7 +74,7 @@ import javax.xml.datatype.DatatypeConfigurationException;
  *  <pre>
  *  {@code
  *    <displayConfiguration>
- *      <densityMap>
+ *      <densityMapping>
  *        <density>
  *          <height>480</height>
  *          <width>720</width>
@@ -95,7 +95,7 @@ import javax.xml.datatype.DatatypeConfigurationException;
  *          <width>3840</width>
  *          <density>640</density>
  *        </density>
- *      </densityMap>
+ *      </densityMapping>
  *
  *      <screenBrightnessMap>
  *        <point>