[automerger skipped] Merge changes from topic "new_aidl_required" am:...

[automerger skipped] Merge changes from topic "new_aidl_required" am: 56b3cf70 -s ours am: 31400912 -s ours

am skip reason: Merged-In Ie2e01b01690a5882574282f3158e454a9b6056e7 with SHA-1 818cbce3 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1800170

Change-Id: I65a5611cf437fe531dea7cdca904b9712f010570