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

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

Change-Id: I736f4cec4d88b9cf3a742a916791e48c0956f2cd