Merge "Keyguard indication area - owner info fix" into sc-qpr1-dev am: 97e242b331 am: 68da7eade2

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

Change-Id: I37f919379396dca5dc1e99899838e9f10e1cdf7f