Merge "Fix perf2cfg unit tests and enable presubmit testing." am: 24348cff04

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1421068

Change-Id: I0f467f1bbc1fb732cd499d9a46a8d069e01762bd