[automerger skipped] Merge "upperLayerIndicator_r15 is optional, nr state design changed" am: 0737c31d am: e595809c -s ours am: a25c005c -s ours am: 8c724cb5 -s ours

am skip reason: Change-Id I7864077df6dad9a8bf70718615e3cfeb8159a50e with SHA-1 b5faf6ea is in history

Change-Id: I3b990b2d229b1f125cfa992a49c7ac049c3eb3f4