Merge "Revert "Revert "[incremental] change build rules to not to use...

Merge "Revert "Revert "[incremental] change build rules to not to use aidl_interface""" into sc-dev am: 65de59e1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic623b14a3f8c1b0183a2fbd1033a58f4f3ff2e66