Merge "Add a missing test dependency for NetworkStagedRollbackTest" am: a4d60be743 am: 9b2421b86b am: 1e8cb3c89c am: 77e999d77e

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

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