Merge "Remove usage of IntegerRes in type usage target" am: d1b31d480a

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

Change-Id: Ie0aa464e556e5839f1b4d8553c2268f4e071d367