Merge "dumpsys += TEST_MAPPING"
am: 79c73f4a9e

Change-Id: I43fda26ab2d9f394e650b6b03d4b341acddefbef