tree 98d13ffd37ab03c4299ecf3947c00b408b21f212
parent 7a603c45b6510d1c2087b225157f840f63950a6c
parent 9ea95064e28313d5df2098d1d764a4825cb741b4
author Hall Liu <hallliu@google.com> 1611798132 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1611798132 +0000

[automerger skipped] Merge "Allow carriers to configure RTT while roaming" into rvc-qpr-dev am: ea6f6c8579 -s ours am: 9ea95064e2 -s ours

am skip reason: Change-Id Ied2418cdec57d2d405d4ed0f0227a251ecd626cf with SHA-1 d20b2a013b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I70bfd489ac62770c5a23db0bd2c26b05ad1375f1