[automerger skipped] Merge "Add setup usage for...

[automerger skipped] Merge "Add setup usage for ACCESS_KEYGUARD_SECURE_STORAGE." am: 6131ca7d am: 3a91a2fd am: 41ae1dc0 -s ours am: 4d6928fc -s ours

am skip reason: Change-Id If03cbf54d69125ee262a0f6ba7a7e11744a442de with SHA-1 76706a2c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93669ce87e316cf63da0a64d648372388320f0b5