[automerger skipped] idmap2: remove the 'scan' command am: 6532483950 am: 29e7a4394a am: 28b23286d5 -s ours
am skip reason: Change-Id Iae073c13ce64b5db48f22f7e723bc8c0c5fcd2c9 with SHA-1 3abb504a08 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519907
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I874c06a113cbb179af6ee63bdb0b758c5987b245
This commit is contained in: