Merge changes from topic "limited_use_key" into sc-dev am: 61e00321e5 am: 827790409b

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

Change-Id: I730647526e1d7e33dc3ada8619ff82d6125de24a