tree cf2bbf5f7e51eb9459b8317d8d521923abc1f4e7
parent af4d35b48f4484e92c1e40b81577970d069879bc
parent f83a8b11df072ef7fc284f78911930248ae8cfa3
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1674609736 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1674609736 +0000

Merge "[automerger skipped] Merge "Do not go to dream on power button press when screen is off." into tm-qpr-dev am: 20e330dc28 am: 5e3e0d6206 -s ours"