[automerger skipped] Merge "Use changeID and Compatibility.isChangeEnabled for Mainline" am: 1d40225791 am: f1317cc00c am: 1d887987dc -s ours
am skip reason: Change-Id I8092f4c7d3be046da337cdcbadeed89844b3aaab with SHA-1 d0c818129a is in history

Change-Id: I799c5cb559782abbf1779c1869b26cde12c77af2