Merge "Merge "Hide AppButtonsPreferenceController for system modules." into qt-dev am: 76cf0dbddd
am: 4f6e6c0849" into qt-r1-dev-plus-aosp
am: 2ce63571d9
Change-Id: I9a0ed23fb54dbb4d3cd36d216b03ef6dcd491b72
This commit is contained in: