[automerger skipped] Merge Coral/Flame into AOSP master
am: bd616ba9f8 -s ours
am skip reason: change_id I6031c354be928d5fab9243571ed423b929811ee1 with SHA1 48f633209f is in history

Change-Id: I35ae9a638eae71bac4381681c55017c352c0a705