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

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



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