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
Change-Id: I624839c01f8303ed01b78fb142ef32fb34646e40