Merge "Fix BottomNavigationView label placement." into nyc-support-25.1-dev
am: 23c369fc71

Change-Id: I5d9a236548b2c32f93fbf409b4160c5ed88b3f36