[automerger skipped] Merge "Add legacy state to 5g timer configs" am:...
[automerger skipped] Merge "Add legacy state to 5g timer configs" am: 5699f000 am: 5e00b85f -s ours am: b02789c3 -s ours
am skip reason: Change-Id Iaf89f4ef9dfcea244033237f74818ab67e104b92 with SHA-1 4ab6a9e9 is in history
Change-Id: Iacb748b39fb4d942b70af829c79ecabb997a6cf5