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

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

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