Merge changes from topic "cherrypick-setDismissKeyguard-sh5oh7kmyi" into tm-d1-dev am: aca8d31cc2 am: f0243591ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19500329 Change-Id: I1a09bf10ab930a2f42ce3f3fd6d822eda12206bf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: