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

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

Change-Id: I74c9ca7b74391d9c365ba39e4ad8471f827c7f0c