ANDROID: Merge remote-tracking branch 'aosp/upstream-master' am: 196a8c054e am: 9b3883290c am: ce48ef2ecb

Original change: https://android-review.googlesource.com/c/platform/external/trace-cmd/+/2084175

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