Merge "Match disabled components for screenshot listeners" into udc-dev am:...

Merge "Match disabled components for screenshot listeners" into udc-dev am: eaa4f512 am: 63e1b3ba

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



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