Merge "Add legacy state to 5g timer configs" am: 5699f000cb

Change-Id: I3efd65adf9b578c75011f8b61dd832243c76c6f5