[automerger skipped] Merge "Disable Launcher AIDL_TAG tracing special case" am: cf36563f87 am: 6b07d27bbf am: c6117e0d60 -s ours

am skip reason: Merged-In Iff92c0a729a9b9b038fb6310c7509925c59547b6 with SHA-1 68730a684a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2253778

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