Merge "Make scribe setting default_on and secure" into udc-dev am: b679e3ee

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



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