Merge "DO NOT MERGE: Keep old callback thread" into rvc-dev am: 4f5495ea9c am: 95acfb402b

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

Change-Id: I42a313cddaf228fa4789928ee1997ddbbe19bb7e