Merge "Use public resouce in android.R package" am: c110082aef am: 18b7b7b386 am: 72f991560c

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

Change-Id: I9e80790dab7ddf569ef81ca1287ae13461a3d544