Merge "Moving keyguard indicator text lower in split shade" into sc-v2-dev am: 4b75032d

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

Change-Id: I3c20392a03e7eeceef6a32601a6ac0e2b3795280