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

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

Change-Id: Iaf7c5791c304e5d16d6032e42747927d01f8f87c