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

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

Change-Id: I8737beca8dfe0bf6cd4b3a117fc2c1b856592c8a