Merge "Fix powersave/powersave idle whitelist" into main am: 639a67fde2 am: 4e740c3130

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

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