Merge "Updated frameworks/base/core assets Bug: 5076695"