Merge "Update idmap2_tests to really work host-side" am: 8ae2344540

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2ec101728830ba75bc1dc1a75cfdd5ef2af72c7