Merge "Add manual rollback sample app" am: 2b11e008 am: bf4b7960 am:...

Merge "Add manual rollback sample app" am: 2b11e008 am: bf4b7960 am: 32a0ea07 am: ec8ec9fb am: 7e5f6973

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



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