[automerger skipped] Merge "Add resource to disable cb" am: d7858116 am:...

[automerger skipped] Merge "Add resource to disable cb" am: d7858116 am: 52c4c695 am: 41adde9a -s ours am: d2f65cf1 -s ours

am skip reason: skip tag Change-Id I060836c10b60638e4155670e16cf6475e6740665 with SHA-1 cc081579 is already in history

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

Change-Id: I12d95d055379c95119b6deedfee7e55e2a2a871f