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

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

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