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

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

Change-Id: I50a12fc968af31b5d6c33d10f9451599c2262014