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

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

Change-Id: I689ee94ca437227f2acc6bbd6726c81cea49ebea