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: 9ebe233a

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



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