[automerger skipped] Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409 am: 4636aea564 am: d4e7e2336a am: 55d000f62c -s ours
am skip reason: Merged-In I8e4425a4e7de716f86b1f1f56ea605d93f357a57 with SHA-1 f0f67b5a31 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080
Change-Id: Ie00a8343b9466c3a92601a06550de5683cf3cef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: