Merge "Align power AIDL VTS with VSR." am: ad41e9d095 am: 552c5af91a

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

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