Merge "Merge "Remove robolectric raw resources." am: 10dfedb7 am: 0427705b...

Merge "Merge "Remove robolectric raw resources." am: 10dfedb7 am: 0427705b am: 912bda62 am: c1e9aa13" into tm-qpr-dev-plus-aosp am: 6771addf

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



Change-Id: I9972e81469fd0072333efff06039f6f4eb62e971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>