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: 0b2492d1 am: edbd6026

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

Change-Id: Id6e6749aa7e323a1c0b5aa546656fc25b1f6e113