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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie597d66089a2de256d8817269179c5426bc7d728