tree a925ca9028129b094e2bcfd814325adf9fe1c171
parent ddea4daf1d8376a181c139fa9aa5c87880e622ae
parent 3157fcdfd894cd58f1713557fef09a760e9b4bb8
author Chen Xu <fionaxu@google.com> 1572979922 -0800
committer android-build-merger <android-build-merger@google.com> 1572979922 -0800

[automerger skipped] Merge "new telephony annotation class" am: 386027afdd am: 54aba99636
am: 3157fcdfd8 -s ours
am skip reason: change_id I37f8a0624bbf27f264870ee9dbf03d3aaa5cadc1 with SHA1 c9d4ee112e is in history

Change-Id: I103636898f05ba53a6249bf45e3806c82fab24e9