Merge "Avoid run RadioInfo activity from non-system users" into nyc-mr1-dev
am: d76a3ed937

Change-Id: Id25c4fd9c982f28412445b02e255589f9ede3ab1