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

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

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

Change-Id: I2126da45b8c658deb14cea1e5ab3dad359ca3dd0