Merge changes from topic "am-ee432f9c105e4e2e8edfeb2d532b0939" into rvc-qpr-dev-plus-aosp

* changes:
  Merge "DO NOT MERGE: Keep old callback thread" into rvc-dev am: 4f5495ea9c am: 793df6dbee am: a24cc034a5
  DO NOT MERGE: Keep old callback thread am: 7b6e6089af am: 0bb84094c4 am: 3e6f27f233