tree c19f35f53b336ce546bc0cf48b406986d191e358
parent b9e295251c27710456eba4a3987d76078160b7d3
parent 799b4fa6f61c5ed6d2db044352e4cc32f30d6e24
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594143798 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1594143798 +0000

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

* changes:
  Merge changes from topic "am-eedfd1b48b8148d8b87aa8f7e122daed" into rvc-d1-dev-plus-aosp am: e1997bc7e0
  Merge "DO NOT MERGE: Keep old callback thread" into rvc-dev am: 4f5495ea9c am: 95acfb402b am: 1505ed8ba3