Merge changes from topics "caitlinshk-nssl-resetuser",...

Merge changes from topics "caitlinshk-nssl-resetuser", "caitlinshk-nssl-snooze" into udc-qpr-dev am: 407c2828 am: 8e5a9f7d

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



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