Merge \"Fix small style issues in ViewPager.\" into nyc-support-24.1-dev
am: 594f73805c

Change-Id: Id377edc56ec9d70a16ca0a8ed2ca1f754e014a86