Merge "Merge changes from topic "Remove telephony protection level" into rvc-dev am: 0ed16d7b am: 5412f745" into rvc-d1-dev-plus-aosp