[automerger skipped] Use framework.aidl built by Soong am: 5180722c -s ours
am: 6a69e019 -s ours
am skip reason: change_id I24621b41860ce1fd1c3ba067430c8d62b49d03cb with SHA1 50bf3127 is in history
Change-Id: Ica91146c050b7cf9731532015fa29c78fea17920