[automerger skipped] Merge "DO NOT MERGE: Keep old callback thread" into...

[automerger skipped] Merge "DO NOT MERGE: Keep old callback thread" into rvc-dev am: 4f5495ea am: 793df6db am: b5c5183a am: 00da0edb -s ours

am skip reason: subject contains skip directive

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

Change-Id: I89f2b2857a57c8490475dc2e22549210637251cf