Merge "Fix PlaybackOverlayFragment sample not work." into nyc-support-25.1-dev
am: 44b377551d

Change-Id: Ib8960ac334f9107193db3bb92e2a4e4b1b75bf83