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: 07e49f6a

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



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