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 am: f7295b1c am: 1a592fab

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

Change-Id: I719f9174f486fc31d862abaae6d6bfbb383ed5b0