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