Merge "Replace qtaguid_deleteTagData with java implementation" am: 397799787d am: 417622a244

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

Change-Id: I2a60fe1df37091acc588e8af4e1d03257192d1f9