Merge "Don't setDeviceEntryIntent on AOD" into sc-dev am: 11f74e42a5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15412657

Change-Id: I547859aec6f2b45c569a2ba3106b2d0da23ae55e