Merge "Use MANAGE_ROLLBACKS permission in SampleRollbackApp." am: 77dfa5ce96 am: 667d8479f5 am: d252d0b14d

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

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