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

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

Change-Id: Ie8f974874eaa3af815ef26b48c0eae086656ad06