Merge "Fix OverlayDeviceTests for un-rooted devices" am: 41663a0eb6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e579f828a14909d5dba4492358d673790b2d41e