[automerger skipped] Merge "Move startWatchingModeWithFlags to the native supported binder calls" into tm-dev am: ec8979daba am: 5f6c206033 -s ours am: 7d3460b685 -s ours

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

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

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