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: 2b7fbf3a

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

Change-Id: I9836b7b6691cd6e4294bd6099a438dc944d7b92f