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

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

Change-Id: I1d805a9c27afeca7bc756a8959e7877083795ea8