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

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

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