Merge "[automerger skipped] Fix bug: TestServiceState can't fake...

Merge "[automerger skipped] Fix bug: TestServiceState can't fake nr_state,data_roaming,voice_roaming am: f56b2588 am: afd5b59f am: 502971d4 -s ours am skip reason: Change-Id I9c216a8d0c0f4f2af9b0d749e68d34ea971b3ab9 with SHA-1 d27507d4 is in history" into rvc-qpr-dev-plus-aosp am: 6dd7f8ce -s ours
am skip reason: Change-Id I9c216a8d0c0f4f2af9b0d749e68d34ea971b3ab9 with SHA-1 f56b2588 is in history

Change-Id: I4c31971c3e785c2713aad30e1f54b758dee0fd09