Merge "Remove bytes matcher from base" am: d3dfca9c68 am: 55a81e6cc0

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

Change-Id: I91dd3f96833b0dea646293013d2d4d33c0264a88