tree ab9005af6f3ce3463ddcbb31418a333d637a00fb
parent df4c16d7bb58c702c896373e5480b4f8495da25d
parent 56ec0b95bce078b6d80130242152a2a9e8f5a20f
author SongFerng Wang <songferngwang@google.com> 1594403872 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594403872 +0000

Merge "Add carrier config for NR timer reset" into rvc-d1-dev am: 08a86e728f am: 56ec0b95bc

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

Change-Id: I8f4894479b5520738672df5962febf4280191f10