Merge "Use public resouce in android.R package" am: 17a9e07870 am: 873edfa5b4 am: 27a963097f

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

Change-Id: I9e80790dab7ddf569ef81ca1287ae13461a3d544