Merge "Add a missing test dependency for StagedRollbackTest" am: 11be6ffc03

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

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