Merge "Merge "Sharesheet - Add outline to image preview" into qt-dev am: 343b96786b" into qt-dev-plus-aosp