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

Change-Id: Ie79d8985597f7fd8c818b594fb512bf5d10efe61