Merge "Show current event threshold in EVENT TRACKER POLICY SETTINGS " am:...

Merge "Show current event threshold in EVENT TRACKER POLICY SETTINGS " am: cbb416e6 am: f6aae3d0 am: 2a6ffcb5 am: 78fbb15b am: e4bae3d1 am: cb89b8d6

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



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