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