[automerger skipped] Merge "s/get_interesting_hal_pids/get_interesting_pids."...

[automerger skipped] Merge "s/get_interesting_hal_pids/get_interesting_pids." am: 273aaf26 am: ef655812 -s ours am: c90a5eb2 -s ours

am skip reason: Merged-In I8ef6b2aaa871f6a8f992887a394d81c544e9cba4 with SHA-1 d1ce457d is already in history

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



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