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