Merge "7/n: Add mechanism to hold onto already-completed operations" into sc-dev am: 63614e99 am: e3aaea77 am: 2cc238ad

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

Change-Id: Ibcc20f914526a53d52045c9d7604d920a5158d8c