Merge "SCREENSHOT_DETECTION -> teamfood" into tm-qpr-dev am: 9414e05051 am: abc6d425c0

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

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