Merge "Change Smart Lock -> Extend Unlock" into udc-dev am: 25897664 am: ea289252

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



Change-Id: I41b8ee5d72623cf3997ee3a4565cba4238f027cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>