Merge "Keyguard indication area - owner info fix" into sc-qpr1-dev am: 97e242b331 am: a0677a8011 am: 45ec6c69b4

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

Change-Id: Idce678055a8621777517226930436cac4c2998c3