[automerger skipped] Merge changes from topic "limited_use_keys" am:...

[automerger skipped] Merge changes from topic "limited_use_keys" am: 892c82e0 am: 0e30e1e4 am: 9ef69031 -s ours am: d7737897 -s ours

am skip reason: Change-Id I9620c4a3e5d2c10ed8a50d494e63eb2fb19dabef with SHA-1 fcb4e8ee is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4145da39223d674250eb4919ee81e635b8625d40