Merge "DO NOT MERGE: Keep old callback thread" into rvc-dev am: 4f5495ea am: 95acfb40 am: 1505ed8b

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

Change-Id: I7e9c55d5ee27ff8dbd974836b5cd7d186ed9aac1