Merge "Keyguard indication area - owner info fix" into sc-qpr1-dev am: 97e242b3 am: a0677a80

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

Change-Id: I8bd544f28b5b14a411642f35e003d1bf6c75400b