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

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

Change-Id: I60e9eae0a72f9c49afaa7c78508c1568f536fa4e