Merge "Don't update the alternate bouncer on unlocked change" into udc-qpr-dev am: 9c9e0b77

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



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