Merge "Fix the bug of not showing lock screen before entering Smart Lock...

Merge "Fix the bug of not showing lock screen before entering Smart Lock page." into rvc-dev am: 7afb61e6 am: b1895fc0

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11949297

Change-Id: I06655ae21068d4f9bd0f9430e88be8b3a69eacf9