Merge changes from topics "people-space-screenshot", "screenshot-hardware"...

Merge changes from topics "people-space-screenshot", "screenshot-hardware" into tm-qpr-dev am: 9fcf0aac am: 55a40279

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



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