Merge cherrypicks of [2944626, 2944869, 2941173, 2943653] into oc-mr1-release

Change-Id: I814319e5084fee44af58bfe8a1130610589fc016

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -1069,6 +1069,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
		cb.onDreamingStateChanged(mIsDreaming);
		}
		}
		updateFingerprintListeningState();
		}

		/**