Merge "Add setup usage for ACCESS_KEYGUARD_SECURE_STORAGE." am: 6131ca7d2f am: 3a91a2fdc2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c028f67530264700d885f7b272f345ba6770a58