Merge "Add null check on NPVC" into sc-dev am: 271c600617 am: e925591857
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14900429 Change-Id: Ia30af80e172d5dc27c328fdde17194825d2c13f1
This commit is contained in: