Merge "Extend RollbackManagerService to handle S extensions" am: 9f2c15890c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95a1b89798c6e3132db7c3b00a2ddd0a0256e10b