Merge "Add carrier config for using user data to detect RRC state" into sc-dev am: 30debe65 am: 1b932f7e am: 41ad4362

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

Change-Id: I0216a100ab52728019331d04de12a8ad869b0284