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

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

Change-Id: Ifae93b7302a5b2d743a4c996c91586da6f23e24e