[automerger skipped] Merge "Adding LOADER_USAGE_STATS permission to shell" am:...

[automerger skipped] Merge "Adding LOADER_USAGE_STATS permission to shell" am: a5a04bbb am: e769f7bf -s ours am: ce6987d2 -s ours am: b511e22c -s ours am: ee5b713d -s ours

am skip reason: Change-Id I4f146337429679edddba698aa88bb9b2cb883ab9 with SHA-1 a2b2226d is in history

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

Change-Id: I77c0dd9e19989d76ea352ea96c73557117d883eb