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

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

Change-Id: I641371ba26e218f4cd186abeb4425558c3b3d01b