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

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

Change-Id: Ie88e8640db85513fd16c383833731f4a014d97e7