Merge "Add resource to disable cb" am: d7858116ca

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

Change-Id: I84149e8db1bda3ee432f557ccdf5a5b70bfb7640