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

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

Change-Id: I4af27181e9739553d5395eddac05f96038d7e634