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

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

Change-Id: Iba21bc06b92a319c503250a5c06c010b1061bb92