Merge "Change Id for lock icon flag" into udc-qpr-dev am: aaef6a2d

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



Change-Id: I2ceac9a0bd5910add2cdae4df2424bd0f5e32ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>