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

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

Change-Id: I54a97a5eb9534874b4d610edf2f48716b798e74d