Merge "Preserve interrupted state across waiting for future" am: 3a91c75184

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

Change-Id: Ida3616549a4d42d381ac414c2e82a638e38c17a2