Merge "Inline usages of LOCAL_STEM" am: b2f8d5c2e6

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/1930925

Change-Id: I3f183f7a7bec14490188f11c33469ecaceaf7961