Merge "Removed calls to NPVC.getView()" into tm-qpr-dev am: c11ec4ac24

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

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