Merge "idmap2: Remove redundant "using" statements" am: 871327e261 am: 5e0db6292d am: 22af5f4dd0

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

Change-Id: Id60f75ef1d69b8f501e21ce8c1ccd8ff9f8548a6