Merge "Controls UI - Show msg prior to first unlock" into rvc-dev am: b30138550c am: 8f243e0d78 am: 7d81b82cf9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11887280 Change-Id: I456855ba48bd85b508bc96b7667fb7177b41b3c2
This commit is contained in: