Merge "Only set userHasDeviceEntryIntent on keyguard" into sc-dev am: ebe9e34fbb am: 569f11095c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403138 Change-Id: I5fef5ec37609bba8fcaaef684691e61635b814a9
This commit is contained in: