[automerger skipped] Merge "[View Controllers] (2/3) Move KSBVC's visibility...

[automerger skipped] Merge "[View Controllers] (2/3) Move KSBVC's visibility and shouldUpdate calculation out of NPVController and into KSBVC." into sc-v2-dev am: 2fc7622e am: 73069e95 -s ours

am skip reason: Merged-In I0a88132293dd5a083122a3fd971a5bbc6487355f with SHA-1 997a43c2 is already in history

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

Change-Id: I24b1e7e1a51f23d62cdc6595aeffbbc88acb00bb