Android O MR1 IOT Release Smart Display r3 (OIM3.180907.022)
Merge "Fixes a stack-use-after-scope sanitizer issue"
am: 82b51b7a2c

Change-Id: Ieb8b2cd7f1a8e5021e04559dd053f92fa55622ce