Merge "Don't consider PACKAGE_USAGE_STATS permission." into tm-dev am:...

Merge "Don't consider PACKAGE_USAGE_STATS permission." into tm-dev am: 4bc2075b am: 0363c598 am: e4c3cf50 am: 55140e62

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



Change-Id: Ib1a8fe9b0c68692e7e86512ffe0388363598d0a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>