Merge "remove PROP_QTAGUID_ENABLED" am: 999147b4ab

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

Change-Id: I695b9b491873fba378affcc540ae03ddfae5e51a