Merge "Add a warning to the atrace binary for deprecating vendor categories"...

Merge "Add a warning to the atrace binary for deprecating vendor categories" am: e2499225 am: f9de7e57 am: 5034fd26

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



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