Merge "Skip sleep-token when switching display which will be on" into 24D1-dev am: 86c54353bd

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

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