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: 14b858ec -s ours am: ee8cf6ae -s ours am: 56ecc7a1 -s ours am: a9b9c36c -s ours am: bb63b456 -s ours" into udc-qpr-dev-plus-aosp am: 16f18cc8 -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: Iedb6867e28e031e08caf3046afc66068d5c990c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>