Merge "Add trace tags for notifications" into sc-v2-dev am: 46386914b4 am: f320c2c78c

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

Change-Id: I2ee02045d1dfb484b5b00c754b3d4e2b026b67e3