Merge "Remove duplicate idmap classes from services.jar" into sc-dev am: b22b87eec7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97fc1239996cf5a5b2b50a9b7cc23f40cced562f