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

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

Change-Id: I32b8d0bf41c82dc0935e5773392a149ab98b750e