tree 76fe3a4aff445f94b61c1604af44886cb9655175
parent 4931429f5a93389416e0356d4900284d8cb3db33
parent 2d98a66b18f0a2d44ca3961668c12812388db6d4
author Chen Xu <fionaxu@google.com> 1574104737 -0800
committer android-build-merger <android-build-merger@google.com> 1574104737 -0800

Merge "add a new telephony protection level" am: cd953e939f
am: 2d98a66b18

Change-Id: Ie07cbd4d8c8350668a5d534fef9f1bd4863e43ab