[automerger skipped] Merge "DO NOT MERGE Spring controlled back progress API"...

[automerger skipped] Merge "DO NOT MERGE Spring controlled back progress API" into tm-qpr-dev am: 92d7e332 am: 79e52721 -s ours

am skip reason: subject contains skip directive

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



Change-Id: I0943b5920b3778b9d2efe95c3294c73de1e18d43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>