Merge "Merge "Overflow button icon - plus instead of three dots" into rvc-dev...
Merge "Merge "Overflow button icon - plus instead of three dots" into rvc-dev am: bedaeb25 am: 93392e30" into rvc-d1-dev-plus-aosp am: fccf73ac am: e69fac20
Change-Id: I40e4911bb21123c3c4ba9d72b36464692b26c9eb