Merge changes from topic "s-resetlockout-update" into sc-dev am: d4481aec

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13882028

Change-Id: I6fb9b3ebf1130063a47edee76488d7187c7cff10