Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2 am: c9e4a2934f am: 9a58bd18f4 am: 27ec2e7d39
Change-Id: I6f1d53433db53af00f72e70b7c6e2adcd2b98572
This commit is contained in: