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

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

Change-Id: I029e6c4037a86993923a3e204df4fef60a4de2bf