Merge "Propagate finger down to KeyguardUpdateMonitor" into tm-d1-dev am: 13c3b1d6 am: 2c59c297

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



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