Merge "Revert READ_PHONE_STATE from an install to runtime permission" into...
Merge "Revert READ_PHONE_STATE from an install to runtime permission" into rvc-dev am: 696dac1a am: bd09692d am: cbd138a6
Change-Id: I4bf409d71a8f64d4c6c299c2b97e42d5feeea3d5