Merge "Add a missing test dependency for NetworkStagedRollbackTest" am: a4d60be743 am: 9b2421b86b

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

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