Merge "Add command to require strong auth" am: de6f930c am: eea45735

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



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