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

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

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