Merge "7/n: Add mechanism to hold onto already-completed operations" into...

Merge "7/n: Add mechanism to hold onto already-completed operations" into sc-dev am: 63614e99 am: 3c00041d am: c7830e52

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

Change-Id: I9067ead4666899b176700e46e222c7d2032e0a7a