Merge "Fix the bug of not showing lock screen before entering Smart Lock page." into rvc-dev am: 7afb61e6dc
am: 7c0f60f24e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11949297 Change-Id: If240648f9ae164915225afc6cefb3e3e7f7d3488
This commit is contained in: