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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58a5928b08c04950c67d102ad808a21c896c58f7