[automerger skipped] Merge Coral/Flame into AOSP master
am: 4d33f1a127 -s ours
am skip reason: change_id I28864c5b8fdd4cb10628672ff5285ddf8391b2d3 with SHA1 819ff9ef6e is in history

Change-Id: I58a89e98025e481530b7c13df25ce7fa7f15977e