Merge "BSD grep doesn't support -P" am: 3ad0c61146 am: 6e008cbb2a am: 39465971f4 am: ae3c5c8033

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

Change-Id: I0813007697d746539a2e234f79db13838b7e1cae