Merge "idmap2: Remove more redundant "using" statements" am: ee8e50ac1f am: a872a08411 am: e676492866

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

Change-Id: I2bef74e6be9d76721e6ef5f4e516f7da8dc574ab