[automerger skipped] Merge "Extend RollbackManagerService to handle S extensions" am: 9f2c15890c am: f4930cfd33 am: 4b72f351ac -s ours

am skip reason: Change-Id I2de18f67f21ea6c57d612829749edeaa11378f41 with SHA-1 a021b767a6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If339701a0fe9a65583821094f3ea1ae2ca591cf7