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

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



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