tree bb7c0c90f67c9b39f8abf3158a0aaaac93a76799
parent 5aa85e2c0820aee10ee273d4bd392756d10110bf
parent a1863280183008deeb1b6ce026a680266f944669
author arnaudberry <arnaudberry@google.com> 1562206380 -0700
committer android-build-merger <android-build-merger@google.com> 1562206380 -0700

TestMedia: prev/next + queue + one custom action am: 8961b919a1
am: a186328018

Change-Id: I5189eb633d9cf9a02d2003d60a6ff1bcea2a8f58