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 am: 3b2d6631

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

Change-Id: Id92aedc6f92f31ad29e89deaf7e965b61b857d09