Merge "Fix a crash in clearning BottomNavigationView menu." into nyc-support-25.1-dev am: 18cba343e6
am: 0b936a5d72

Change-Id: I3c192aebb313257452f7105ca5e6269ff095885e