Merge "improvements of CBR on compainion devices" into sc-dev am: 9b03c1c496 am: 3318f3af4a am: ac52a3a921

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

Change-Id: I8a9abcfe0307929128881df6559374b529554f19