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

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

Change-Id: I25c8ba26bf84a2e8ceca8517a937fbed1378d83a