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

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

Bug: 219986520

Change-Id: I87465d2133e1a4e61d242509e57d121e5ef465ec
tree: 5c0971d99e35ecfcff85a70c2b593761161669d7
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/