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

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

Change-Id: Iaee65942901376490e577eb2c57dc9f23a9f9f7c