Merge "Fix KeyguardUpdateMonitor auth lifecycle issues" into sc-dev am: 755ee24f4c am: ada08b0668

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

Change-Id: I480813892480f81ac4961515fedc396e16d27e2c