Merge "Factor out helper method." am: e003cac92e am: fae29d4878

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2177903

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