Merge \"Two more BottomNavigationView fixes.\" into nyc-support-24.1-dev
am: 03965865b0

Change-Id: Idc582959f81c8fbee9e3bdad00dbb8f24dec20f5