Merge "Fix a couple of regular expressions." am: 9d99ac49 am: e2c59597

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



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