Merge "Start activity from Device Lock APEX if device is provisioned by Device Lock" into udc-dev am: f5ce620937
am: 433d934b89
am: 98c03bb946
am: a2bf21667b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087508 Change-Id: I002089e7fb29f81ace8077068f0093b61dc1564a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: