tree 3368c67b8bc709865f5d16f2a4113e0a2b1d941b
parent afce5abdd0afc625c63a426192d91f37a291e2b0
parent d3844aff1840867e009d1f9c7d25cbd49409dad9
author Xin Li <delphij@google.com> 1607572010 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607572010 +0000

[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: e3b75eec54 -s ours am: d3844aff18 -s ours

am skip reason: Change-Id I352101d8fd2d8815109498778ba9417becbe98cb with SHA-1 d54c5315d3 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1521299

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I087256d55d1e3777e90ebf2e07d8bdd4a34cbdd2