Merge "Fix a couple of regular expressions." am: 9d99ac49a1 am: e2c5959728 am: 63c4e00963

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2296477

Change-Id: Ibea59a7e9a9bc44003b57601a46571f4e1ce14a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>