Merge "[automerger skipped] Merge "Move startWatchingModeWithFlags to the...

Merge "[automerger skipped] Merge "Move startWatchingModeWithFlags to the native supported binder calls" into sc-dev am: 54ae55db am: 5514a571 am: 2d2e7fd1 -s ours am: 76926dd4 -s ours am: 552d655e -s ours am: 64a44bbb -s ours am: 2b6bfdf8 -s ours am: 61fa0d0b -s ours" into udc-qpr-dev-plus-aosp am: 19dcef4d -s ours

am skip reason: Merged-In I54eefca5f0aa4f924debc1817b04a103b6e8e2e6 with SHA-1 fc85ac06 is already in history

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



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