Use changeID and Compatibility.isChangeEnabled for Mainline

Test: Treehugger
Bug: 145147528
Bug: 147600208

Change-Id: I8092f4c7d3be046da337cdcbadeed89844b3aaab
2 files changed