Merge \\\"Fix ViewPager.DecorView annotation inheritance DO NOT MERGE ANYWHERE\\\" into nyc-dev am: 06a35ffe83  -s ours am: 307b9f19b9  -s ours
am: 9e0819bfaa  -s ours

Change-Id: I0c851634e0682e61400b81f7800cb88c7cbd62eb