Merge "Make PhoneStatusBarPolicy injectable." into rvc-dev am: 2f9694c6 am: 553de2c9 am: c946183b Change-Id: Ic7f2b5c50f490e4090301bd40a65a7fff3423487