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

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

Change-Id: I3782ab1b20ef6e8d50fe507f28dfb20bb9d370bf