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: 58074ec5" into rvc-d1-dev-plus-aosp am: be1de232 am: 25d3e3a5
Change-Id: If2437c456f2cac3a19bab41a5cabca97d735cfd6