Merge "idmap2: fix for compiler update." am: 0cb190e889 am: 951a22e80e

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

Change-Id: I6a43049b33454a9fe615325d7812935de6eaea41