Merge "DO NOT MERGE: Keep old callback thread" into rvc-dev am: 4f5495ea am: 793df6db am: a24cc034

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

Change-Id: Id9b47d058eb9fc318a286151d10d76eae62fb9a9