[automerger skipped] Merge "Tests no screenshot is copied when user consent timed out" into qt-qpr1-dev am: caef6680b2 -s ours am: f615871c45 -s ours am: 098e00c136 -s ours
am skip reason: Change-Id I5bc8fcbff908258a20c5515a6ba092ceab1cc447 with SHA-1 9516a007c5 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11947527
Change-Id: If8592bec331b385b5ea04fba92f6be27081c003e
This commit is contained in: