Merge "Fix BottomNavigationView not saving state" into nyc-support-25.2-dev
am: 4f41598d9d

Change-Id: I3e3072b9ef968090d65ef3ae0210263eb2b4f841