[automerger skipped] Checks if there is a device state override active am: 24afd430 -s ours

am skip reason: Merged-In I36959310d8e6c9b5e4e1e4093d17cad7d4f6238e with SHA-1 7709d355 is already in history

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

Change-Id: I55b053098294005bdd56cf355752725883dc543f