Merge changes from topic "Remove telephony protection level" into rvc-dev am: 0ed16d7b am: 86baf0e5 Change-Id: I34e8d14c12ba24ccfc61f3b1caffd57bdb705980