Merge "Add non-system overlay flag for usb perm dialog" into sc-qpr1-dev am: 9c58022d am: 260baf03

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

Change-Id: Ib479181e9c05914a69bfc52da6f1beb3cc216fd9