Merge "Inline usages of LOCAL_STEM" am: b2f8d5c2e6 am: 286d03fad2 am: b9b64916cc

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

Change-Id: If1392df8add698c10a4a57a57845b81fe28750d3