[automerger skipped] Merge Coral/Flame into AOSP master
am: da7bdb048a -s ours
am skip reason: change_id Idcc41fbea7b61009be4b478fdd4ebebdf5b22586 with SHA1 62696be94d is in history

Change-Id: Idab911ad991ec239775953104652018d5f8faf8e