Merge "Reannotate emergency broadcasts in TelephonyManager" into rvc-dev