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

Change-Id: I1f571dc0f44ef804267a5528c6d2176738519684