[automerger skipped] Merge "Add monitor related code" into udc-dev am:...

[automerger skipped] Merge "Add monitor related code" into udc-dev am: c8237b34 am: c33539a1 -s ours

am skip reason: Merged-In I05258c0ce17de38fb220f97ddbdda75a6bab1a1f with SHA-1 539123ff is already in history

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



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