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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d62a536e70fd90c4ea68caa4ef4881d89e0f2f2