[automerger skipped] Merge "DO NOT MERGE: DropBoxTest needs...

[automerger skipped] Merge "DO NOT MERGE: DropBoxTest needs PACKAGE_USAGE_STATS permission" am: b9c917f5 am: dcfb1402 -s ours am: 8f797294 am: c92a6e78 am: df8b8e6a -s ours

am skip reason: subject contains skip directive

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

Change-Id: If044b78de218d0bcd13f37e1d960ea72192cb17e