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

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

Change-Id: I362da94b4ee8445aff305872024a4aff55cc9d3d