Merge "Align power AIDL VTS with VSR." am: ad41e9d095 am: 552c5af91a am: 3ed3c93807 am: 9b3c393362

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2258581

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