Merge changes from topic "revert-17541694-b227767144-enable-DPQDJMXSZN" into tm-mainline-prod am: 46068ed2

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



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