Merge "Add resource to disable cb" am: d7858116ca am: 52c4c695a8

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

Change-Id: I1c75fcbafe846e303ab9d0d46cb8679baa3bbab5