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

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

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



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