[automerger skipped] Merge "Preserve interrupted state across waiting for...

[automerger skipped] Merge "Preserve interrupted state across waiting for future" am: 3a91c751 am: f6574a21 am: faa8d920 am: 02e592f7 am: 23bead5d -s ours

am skip reason: Change-Id I066180e8028cc426fa1b3739fa007faa17c8c012 with SHA-1 022c8ef7 is in history

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

Change-Id: Icb4f878d9acefd9b686a18510cf8903bfa5f231a