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

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

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