Merge changes from topic "limited_use_keys" am: 892c82e0f2 am: 0e30e1e432

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I47c55cba74b3fe9aacdeacd6fc13197dd57293f6