[automerger skipped] Merge "Support legacy state for 5G timers" am: 8dfe3894...
[automerger skipped] Merge "Support legacy state for 5G timers" am: 8dfe3894 am: b65d5c62 -s ours am: a65a843b -s ours
am skip reason: Change-Id Iaf598cd5c0730e8c6b79d4e908283500ae4062fa with SHA-1 d5eee5f0 is in history
Change-Id: I158cfe8a65cb0396c88c69a50816b5e45df7703c