Merge "DO NOT MERGE ANYWHERE GenericSource: still feed audio decoder when paused. am: 72feab63b5  -s ours am: 76945790ac  -s ours am: 36dc8cd573  -s ours am: 6f03f590c0  -s ours" into oc-dr1-dev-plus-aosp
am: 733e580c2d  -s ours

Change-Id: I925ec56182effef98eeaef52e151601769bda86b