Merge "Revert "Revert "Bump emojicompat bundled font to 15""" into androidx-main