Merge "Merge "Add additional CB atoms" into rvc-dev am: 47a03148 am:...

Merge "Merge "Add additional CB atoms" into rvc-dev am: 47a03148 am: f1237c1a" into rvc-d1-dev-plus-aosp am: 458e902b am: 29a0a1ec

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

Change-Id: I2d2e4d19e8e49a4b26deb568e297916d9511f9f3