Merge \"Add more fixes to BottomNavigationView.\" into nyc-support-24.1-dev
am: 62f611f9fd

Change-Id: Ib3fa88422cfd73817a077397080947c51284ff42