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

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

Change-Id: Ib75de76b6a0fbedbe465072b7448208db10b4b0e