Use changeID and Compatibility.isChangeEnabled for Mainline

Test: Treehugger
Bug: 145147528
Bug: 147600208

Change-Id: I8092f4c7d3be046da337cdcbadeed89844b3aaab
Merged-In: I8092f4c7d3be046da337cdcbadeed89844b3aaab
Merged-In: I4294359fc7bcf4d739b6e01439dc47fa99999d2c
(cherry picked from commit d0c818129a95d812460dcc8220843105b31160a9)
2 files changed