Merge "Change behaviour of screen capture disabled" into rvc-dev am: 2a02c8e3 am: 362ada44 am: 33619554

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

Change-Id: I5998f7164ecf7028b0b7e6677c48d057961955e8