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: 688685dd am: fb3a542b
Change-Id: I286f690ecaea8237c7aa1dbff33eea3a78585fc5