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