Merge changes from topic "am-eedfd1b48b8148d8b87aa8f7e122daed" into rvc-d1-dev-plus-aosp

* changes:
  Merge "DO NOT MERGE: Keep old callback thread" into rvc-dev am: 4f5495ea9c am: 95acfb402b
  DO NOT MERGE: Keep old callback thread am: 7b6e6089af am: 1f4c5e6b4e