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

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

Change-Id: I35cc5ba5f099e58291d4c71cdd46445390f99b55