Merge "Revert "Push OverlayDeviceTests onto /system"" am: b294b8bc61 am: c0d6dea0fb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3bfc4304d0a230c15e011d0a2a456714bfefbf50