Merge "Add permission for protecting UI tracing" am: 854bb5b5eb am: 6f53cbb440 am: 0ea696e448

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1500510

Change-Id: Ica7298518b7b3376666bbd511480d428c6f3fd7d