Merge "DO NOT MERGE: Keep old callback thread" into rvc-dev am: 4f5495ea9c am: 793df6dbee am: b5c5183a44

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

Change-Id: Ibea8378b5e92961997fa28b129ee775d3e72c56e