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

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

Change-Id: I6c3bf1cf99b0fe8a9942c55e384077012dbd7f80