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

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

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



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