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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id35c028eb03a35c0255a35e30440d52c210250fe