Merge changes from topic "screenshots_logs" into sc-qpr1-dev am: f88195c2

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

Change-Id: I46e1723ea4f74222623152fc220340f314c08950