Merge changes from topic "limited_use_keys" am: 892c82e0f2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iab72f38be68f1efe3f70e180ab270defb1277058