Merge "Revert "Add a warning to the atrace binary for deprecating vendo..."" am: 71e68dcfc4 am: fb78bc1c5a am: b84e614a65

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2149974

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