Merge "upperLayerIndicator_r15 is optional, nr state design changed" into...
Merge "upperLayerIndicator_r15 is optional, nr state design changed" into rvc-dev am: 5eec2486 am: 1a25db68 am: cb77fcf9 am: 11ab3115
Change-Id: I4508acb0a79b71ee07fef2ebac78af5ac9fc6d6e