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

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

Change-Id: Ife28e4a4415f7a4f909b54d815190044dd96efc8