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

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



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