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

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

Change-Id: I511fd2e6cf6c2b656d69fdb59c497e548e42c944