[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: 95acfb40 am: 1505ed8b am: abbd9a61 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iad22a65ce5321db6c2f2dc8fd38f7cb93bc9c98e