[automerger skipped] Merge "Remove usage of IntegerRes in type usage target"...

[automerger skipped] Merge "Remove usage of IntegerRes in type usage target" am: d1b31d48 am: c04764cc am: fe42e7de am: 59c04407 -s ours

am skip reason: Merged-In I55129c609ecc26ee71f234778de379d31c9e9cb6 with SHA-1 2114c48c is already in history

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

Change-Id: I8f984849b78b0e9618da808e815ef397cc7d1222