Merge "Merge "Preserve interrupted state across waiting for future" into rvc-dev am: 8aebfdee am: 882b1984" into rvc-d1-dev-plus-aosp am: b8ab87d1 am: 29fc940a

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

Change-Id: Iaa55e3d1168b603b06b03a97df2b7196bbe5baf4