Merge changes from topic "caitlinshk-npvc-singleton" into udc-qpr-dev am: 5afe5c46 am: ae8f3124

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



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