Merge "Fix KeyguardUpdateMonitor auth lifecycle issues" into sc-dev am: 755ee24f am: c7b6619d am: 11520c06

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

Change-Id: Ifd8cf40cfd6e0db4d29ac429dda167bb4c81e55a