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

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

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