[automerger skipped] DO NOT MERGE: Keep old callback thread am: 7b6e6089 am: 0bb84094 am: 34c95b84 am: 16a375ca -s ours

am skip reason: subject contains skip directive

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

Change-Id: I119a8ead8c3977ad1c3224313bff2f56f8ab3c8e