tree e8c001e2b3f3017131591b16b7dcbbc322f18575
parent baed81d89de5b3e69f084ee56e78e1b2c1c400f1
parent e5111613d0a14c1ec0239743e200ef9f97400882
author Josh Tsuji <tsuji@google.com> 1643216137 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1643216137 +0000

[automerger skipped] Merge "Check that PowerManager#isInteractive is false before showing the AOD UI for screen off." into sc-v2-dev am: 34e29db6b1 am: e5111613d0 -s ours

am skip reason: Merged-In I7e2d1ca7e3c9487903f74fb06575cc0a36b9502c with SHA-1 a20d7f2708 is already in history

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

Change-Id: Ida83870330e1373712a8c9e5e32ed2715bd98a62