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

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

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