Merge "Re-add DO Disclosure text to lock screen; now faded." into rvc-dev am: 01b07e368f am: 0c6e01702b am: 04b40cf229
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11852820 Change-Id: I5c9ac6957356b21bcb3c26d7679608d788adc3ce
This commit is contained in: