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