Merge "Replace private attributes with public resources." into sc-dev am: 9c219f140f

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

Change-Id: I4b1ad2ce209c0f5bcc91b7a4a25b9651e5faf689