tree e65d99eb8123f426e526d63249bdab457d949e3d
parent c1e512c65d0c36d65b8825a4642ce200b5524e01
parent 501d21c629c79d03b2f9de50a04c69ad8389e9ec
author Chen Xu <fionaxu@google.com> 1574104980 -0800
committer android-build-merger <android-build-merger@google.com> 1574104980 -0800

[automerger skipped] Merge "add a new telephony protection level" am: cd953e939f am: 2d98a66b18
am: 501d21c629 -s ours
am skip reason: change_id Ib3be016080d42fd76e7c131f4e44d815ce431e6e with SHA1 45c183d201 is in history

Change-Id: Id9062136a3d2679d7f8a26fc92cc1bba0d048ee1