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

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

Change-Id: I578a9ef258734c51ee60349c7841dfaaf15c8165