Merge "upperLayerIndicator_r15 is optional, nr state design changed" into...
Merge "upperLayerIndicator_r15 is optional, nr state design changed" into rvc-dev am: 6e6e2330 am: e0c2dbaa am: ffbf245a
Change-Id: I46b20a2c56dfea490af78cff05abfa0bb4343c88