[automerger skipped] Merge "Unblock screen-on after start transaction is...

[automerger skipped] Merge "Unblock screen-on after start transaction is completed" into 24D1-dev am: bb950542 -s ours

am skip reason: Merged-In Ibed2cf715cc3898167cab02e21405bf028ca1111 with SHA-1 23746d91 is already in history

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



Change-Id: Ie8edf9aa943cc8e82c231a43104a54634500c4af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>