am 01af870b: am 2ef2d46f: (-s ours) am 0ff3d838: Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev

* commit '01af870bc229bb6fc1494d1fb0e8779360e7a956':