tree 797c6b59ec428f0cd49bf3fdd367aaed5fe1aeb5
parent 8a5b72442e5f1ad7d47b24ef76fe8abc2790e10c
parent e431ce4aef535b448f575c5358e292502d760faf
author Sarah Chin <sarahchin@google.com> 1623186617 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623186617 +0000

Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" am: e431ce4aef

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

Change-Id: Ife9c588798034e05967b3e0eeef28fdb6a24e1e5