[automerger skipped] Merge "Update the RKP aidl dependency" into...

[automerger skipped] Merge "Update the RKP aidl dependency" into tm-qpr-dev-plus-aosp am: 9f98de23 -s ours

am skip reason: Merged-In I86f864003e38224936375930891abb38f7d55d3d with SHA-1 f8aea9b9 is already in history

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



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