DO NOT MERGE: Keep old callback thread am: 7b6e6089af

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

Change-Id: Ida1f71a7ed2e56cbb09ea5099d34dc2f870932fa