[automerger skipped] Merge "Move startWatchingModeWithFlags to the native supported binder calls" into tm-dev am: ec8979da am: a1196b51 am: 7f7f82bb -s ours

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

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



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