[automerger skipped] Merge Coral/Flame into AOSP master
am: 0205f87a01 -s ours
am skip reason: change_id I96a71b7a888dac84188d7e546b0bfb9082711da8 with SHA1 091d81511b is in history

Change-Id: I9614852567f9b98b4ef9079d946ef33fbb9f1068