Merge "remove PROP_QTAGUID_ENABLED" am: 999147b4ab am: 8d888d92ed am: b3135ed72d

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

Change-Id: Ic0b15f0fa54ceb4f62114fd29248e7427fa5f86b