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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0525af7088d087667169b6bda6e9a5d037ea3feb