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: 8bd3ae93 am: a549401a
Change-Id: Id7567d16a51572304352c93d2331290a8ba8a14c