Merge "Don't setDeviceEntryIntent on AOD" into sc-dev am: 11f74e42a5 am: cb50fcf99b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15412657 Change-Id: I37956e4bbf99ae21965bda492f06652efc8e9f2e
This commit is contained in: