Merge "Preserve interrupted state across waiting for future" into rvc-dev am: 8aebfdee am: 2b7fbf3a am: f7295b1c

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

Change-Id: I0378002d57d6f21d011627bb2e218f7ffd780e87