Merge "Merge "Overflow button icon - plus instead of three dots" into rvc-dev am: bedaeb25 am: 58074ec5" into rvc-d1-dev-plus-aosp