[automerger skipped] Merge changes from topic "aidl_trace" am: e75a6f86 am: 7a54741e am: 13067850 -s ours

am skip reason: Merged-In I9d46d2362ca0ca33bc2477d68092f7ba5fe9c8ac with SHA-1 fe43ff27 is already in history

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



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