[automerger skipped] Merge "Fix OverlayDeviceTests for un-rooted devices" am:...

[automerger skipped] Merge "Fix OverlayDeviceTests for un-rooted devices" am: 41663a0e am: 7a278ceb am: 6c458c64 -s ours am: 0d989e96 -s ours

am skip reason: Change-Id I4377207428182fbb76c09abef248b69eeae6acf5 with SHA-1 7c8e650c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0c3787fe3be7214eb48bd37ee4333e1d9c13fac