[automerger skipped] Update requested state after applying pending frames am: 23c75281ef am: 02b0205641 -s ours am: 328d06eee4 -s ours

am skip reason: Change-Id Id8f3c1956fbfe3ad16f167ff76297dde6c634e81 with SHA-1 1a53789bc8 is in history

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

Change-Id: I9292703c416596e8dee8b980de907862fead52ca