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

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

Change-Id: Idcb86db0f3bdd298dbba16781e300b48ee30e94b