Merge "SCREENSHOT_METADATA -> teamfood" into tm-qpr-dev am: 01c3288688 am: 381cdbcacb

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

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