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

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

Change-Id: I793bb92277b653ad7818ba15a29d7ac367d4bd44