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

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

Change-Id: I97c2f61cf388012a0b945bb1d81d479500e66b32