[automerger skipped] Merge "Remove OverviewProxyService from NavBarView." into...

[automerger skipped] Merge "Remove OverviewProxyService from NavBarView." into tm-dev am: 7605f736 -s ours am: 81f2431f -s ours am: 716b0792 -s ours

am skip reason: Merged-In I991edf533f53557c331d03c679319325fad31343 with SHA-1 0b418ab3 is already in history

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



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