Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2 am: 2ae7c371cb am: 6bc38f14a5 am: 819edf41f3 am: 179e37b256
Change-Id: Ib5b357759b61676149655bab5438360534ef6e51
This commit is contained in: