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

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

Change-Id: If6f070133c23a0eb834ea5b1a887b209bb72dd4b