Merge "[MS43] Remove EventLogTags depdendency" am: 5d46aecf45 am: ca3075c6cd am: 506149854c

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

Change-Id: I79a05cfe449db21fc4cfc48aed012224a8b3affc