Merge "Test mapping changes can be made by anyone." am: e4550434e5 am: 001460d8fb

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

Change-Id: Iaf52135bbc46779bf78c6aaf749451192e06c6c3