Merge "Stop sending OnTabSelectedListener calls with null tabs." into nyc-support-24.1-dev
am: d3a78d41aa

Change-Id: I8d837a6308f50f1dd9bad4038c8fe13549ed70c8