Merge "Returns a service parse error on overrides across the treble boundary." am: cf539f162f

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1493249

Change-Id: I056580bcd02fa0cd72a2d907f83c52fb1eaf582f