[automerger skipped] Merge Coral/Flame into AOSP master
am: 3b144695cd -s ours
am skip reason: change_id Ic4676321420e9b094ca38bfec548d3050dd3d1cc with SHA1 532485089d is in history

Change-Id: I8818bb75c0adf55562b0870ca18c6a660d1a1415