Merge "DO NOT MERGE Spring controlled back progress API" into tm-qpr-dev am: 92d7e332

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



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