Merge changes from topic "aidl-partition-check" into main am: 4ac78a180d am: 86b835d349

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3440648

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