Merge "Change behaviour of screen capture disabled" into rvc-dev am:...

Merge "Change behaviour of screen capture disabled" into rvc-dev am: 2a02c8e3 am: 4e332683 am: da45fdc9 am: b00d0369

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

Change-Id: I69ae26a0dabb271a9f59abe1c060be0f4285c06c