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

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

Change-Id: I8bad578d9be53a2304c623f930fd209a893e2245