Merge "Re-add DO Disclosure text to lock screen; now faded." into rvc-dev am: 01b07e368f

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

Change-Id: Ib961eec96af375e61e28e1757f5deb6a8439d173