Merge "Test mapping changes can be made by anyone." am: e4550434 am:...

Merge "Test mapping changes can be made by anyone." am: e4550434 am: 001460d8 am: b849228b am: 7d36b17c

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

Change-Id: I9be273702cd4069636da86f6080f55941c8a7ba7