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

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

Change-Id: Ib19759cd466623f08faa0ccefeb2050f1f83bc95