tree f972394b5b2323c1e54ac37173e3f2913d269b93
parent 82e5eb33f97c7794b2d75ceb1ea214a6f63576d1
parent fd1302b4efa12787a596557f956f64bfbb095e5c
author Meng Wang <mewan@google.com> 1641519904 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641519904 +0000

[automerger skipped] Deprecate get/setLine1Number in favor of get/setPhoneNumber am: 3e436616c6 am: 9fb15e5b46 am: 9c95c6e001 am: fd1302b4ef -s ours

am skip reason: Merged-In I09bcdca9d44d6b6a6d4ca00b6d0bba4c45a39bac with SHA-1 8665b5105e is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1920743

Change-Id: Ia3247f414d7d54940994290f3b8f26291cc76c51