[automerger skipped] Merge Coral/Flame into AOSP master
am:mainedd21ffb49
-s ours am skip reason: change_id I4af5f825051fb85e4c6d58f310d9209036c63ea8 with SHA1c8782e216f
is in history Change-Id: I50ae1a452471407dd779e039f192d4ec95c12a1c
commit
2b7ba7e4af