Merge "Support monitor arg for bmgr restore, and include detailed agent logs"...

Merge "Support monitor arg for bmgr restore, and include detailed agent logs" into udc-dev am: d26c00f7 am: 17b49472

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



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