Merge "Create EVENT_TRAFFIC_DESCRIPTORS_UPDATED" am: 35ac7e34ce am: d47e88e58c

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

Change-Id: I8bb65c4e479224ce09674696e0e70ff61de9f643