Merge "[MS43] Remove EventLogTags depdendency" am: ea6321a171 am: 1529463a78 am: faa577b2d2

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

Change-Id: I79a05cfe449db21fc4cfc48aed012224a8b3affc