Merge changes from topic "caitlinshk-nsslc-singleton" into udc-qpr-dev am: f3e8d5fc

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



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