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