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

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



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