[automerger skipped] Merge "DO NOT MERGE: Keep old callback thread" into rvc-dev am: 4f5495ea9c am: 793df6dbee am: a24cc034a5 am: 517a30beba -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5f19de11747e7121f0a8f62208d55305a7fc092d