Merge "Add debug property to safe guard ANGLE developer option UI." into udc-qpr-dev am: e456cb72

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24842231



Change-Id: Iaae1e5f2747e8e6d62c5426ded572b792642e9b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>