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

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

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



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